From: Kenichi Handa <handa@m17n.org>
Date: Thu, 5 Nov 2009 04:16:04 +0000 (+0000)
Subject: (Finsert_file_contents): Be sure set coding-system of
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~6368
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f6a074209a507c56ff9183b0806af0f214fc29f9;p=emacs.git

(Finsert_file_contents): Be sure set coding-system of
the buffer in case of replace.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8dd87270863..d103f180c52 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-05  Kenichi Handa  <handa@m17n.org>
+
+	* fileio.c (Finsert_file_contents): Be sure set coding-system of
+	the buffer in case of replace.
+
 2009-11-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* puresize.h (BASE_PURESIZE): Increase to 1620000.
diff --git a/src/fileio.c b/src/fileio.c
index 146e77c14ec..c61604ac31d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3713,6 +3713,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
 	}
 
       coding_system = CODING_ID_NAME (coding.id);
+      set_coding_system = 1;
       decoded = BUF_BEG_ADDR (XBUFFER (conversion_buffer));
       inserted = (BUF_Z_BYTE (XBUFFER (conversion_buffer))
 		  - BUF_BEG_BYTE (XBUFFER (conversion_buffer)));